Merge.
authorshand@kneesaa.uk.xensource.com <shand@kneesaa.uk.xensource.com>
Thu, 29 Jun 2006 10:20:46 +0000 (11:20 +0100)
committershand@kneesaa.uk.xensource.com <shand@kneesaa.uk.xensource.com>
Thu, 29 Jun 2006 10:20:46 +0000 (11:20 +0100)
commit11d2c32b35075d2e7ed9c83d097df60cbe6df098
treecf7ee1544a2214371ffe5048d0d029f93cb29e75
parent8692316a65d11bf0854ef5e26bd24caf14451af5
parentee590e60840e151cdfa7548b71f9a9e55618a7fb
Merge.